Move back to static.rust-lang.org

The mac bots have been fixed

diff --git a/.travis.install.deps.sh b/.travis.install.deps.sh
index 7dddf50e2db92887d3c74eacf0bbe0c2516d995e..a12a930ad56d26a2a0453f9bc5df30b40219fd6d 100755 (executable)
--- a/.travis.install.deps.sh
+++ b/.travis.install.deps.sh
@@ -19,9 +19,9 @@ fi
 # just install the right ones? This should enable cross compilation in the
 # future anyway.
 if [ -z "${windows}" ]; then
-    curl -O https://static-rust-lang-org.s3.amazonaws.com/dist/rust-nightly-i686-$target.tar.gz
+    curl -O https://static.rust-lang.org/dist/rust-nightly-i686-$target.tar.gz
     tar xfz rust-nightly-i686-$target.tar.gz
-    curl -O https://static-rust-lang-org.s3.amazonaws.com/dist/rust-nightly-x86_64-$target.tar.gz
+    curl -O https://static.rust-lang.org/dist/rust-nightly-x86_64-$target.tar.gz
     tar xfz rust-nightly-x86_64-$target.tar.gz
 
     if [ "${BITS}" = "32" ]; then

diff --git a/src/etc/dl-snapshot.py b/src/etc/dl-snapshot.py
index efc4e9af408c1ac4f48402966a1e1334db0d1618..cf3c40fcbe760ac18d4d6f4f41cfd5e2452c1d74 100644 (file)
--- a/src/etc/dl-snapshot.py
+++ b/src/etc/dl-snapshot.py
@@ -33,8 +33,7 @@ else:
 platform, hash = me.strip().split(' ')
 
 tarball = 'cargo-nightly-' + triple + '.tar.gz'
-# TODO: switch this to static.rust-lang.org when the mac bots are fixed
-url = 'https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/' + date.strip() + '/' + tarball
+url = 'https://static.rust-lang.org/cargo-dist/' + date.strip() + '/' + tarball
 dl_path = "target/dl/" + tarball
 dst = "target/snapshot"